From 590e7e68d8c774e5776736d75cf2602cc4f4dc5d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sat, 15 Oct 2016 21:30:47 +0100 Subject: [PATCH] filechooserwidget: Rename error variable Avoid shadowing an existing error. --- gtk/gtkfilechooserwidget.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 9be432059d..c323cb8ca9 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -6567,13 +6567,13 @@ name_entry_get_parent_info_cb (GCancellable *cancellable, } else if (parent_is_folder) { - GError *error; + GError *internal_error; - error = NULL; - g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, + internal_error = NULL; + g_set_error_literal (&internal_error, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED, _("You do not have access to the specified folder.")); - error_changing_folder_dialog (impl, data->parent_file, error); + error_changing_folder_dialog (impl, data->parent_file, internal_error); } else if (info) { @@ -8533,7 +8533,6 @@ post_process_ui (GtkFileChooserWidget *impl) GFile *file; /* Some qdata, qdata can't be set with GtkBuilder */ - g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), "fmq-name", "file_list"); g_object_set_data (G_OBJECT (impl->priv->browse_files_tree_view), I_("GtkFileChooserWidget"), impl); /* Setup file list treeview */ -- 2.30.2